Merge "Better fix for GL wallpaper creation" into jb-mr2-dev