Merge "Ensure wallpaper creation succeeds" into jb-mr2-dev