Merge changes Ic9dc1fe3,I1ca71ccf into sc-dev

* changes:
  Ensure wallpaper isn't cropped unnecessarily
  Compress wallpaper to PNG instead of JPEG when setting wallpaper