Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev