am a80ea2ee: am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

* commit 'a80ea2eec3df6477fcf04563c8bc47a57e90ce91':
  Fix WallpaperCropper crash when setting wallpaper over 8MB