am 8f2a9e4d: Merge "Cleaning up some resources in WallpaperPickerActivity" into ub-launcher3-burnaby

* commit '8f2a9e4dbfc6a475f70e791123bebb56a5a94e29':
  Cleaning up some resources in WallpaperPickerActivity