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