Merge "Cleaning up some resources in WallpaperPickerActivity" into ub-launcher3-burnaby