Merge "Fixes crashes in WallpaperPicker2 app on AOSP" into udc-qpr-dev