Merge "Move saved wallpaper images from cache directory to data directory" into jb-ub-now-kermit