am af4324cc: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'af4324cc0ad6fb4d4a7716ebff2421424c4a2292':
  Fix issue #7271589: Cannot set Ocean HD live wallpaper