Merge changes If55c309c,I3684d489 into main

* changes:
  Add sampleSize to wallpaper_info.xml
  Small safety checks in WallpaperCropper