am e3d8774d: am a07d047f: Merge "Don\'t clean up wallpaper map entry when...
am e3d8774d: am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev
* commit 'e3d8774d':
Don't clean up wallpaper map entry when stopping a user.