Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev