Merge changes Ifc451f54,Ifefd3e56 into sc-dev

* changes:
  Cache set wallpaper as PNG instead of JPEG
  Only rescale wallpaper if its > display height