Merge "Fix adding live wallpaper in a second user" into jb-mr1-dev