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

* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.