am b2a275ec: Merge "Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085)" into jb-dev

* commit 'b2a275ecd2a5c02f2c4b51f5142e0d253746e534':
  Consistently re-enabling the wallpaper when we leave launcher. (Bug 6445085)