Merge changes from topic "revert-14802973-JAWUFIIXLT" into sc-dev

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