Merge "Adjust set wallpaper buttons container" into udc-dev