Merge "Speed up user-switching wallpaper changes" into jb-mr2-dev