Merge "Fix issue #7271589: Cannot set Ocean HD live wallpaper" into jb-mr1-dev