Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev