Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev