Merge "More work to ensure that the wallpaper is visible before transitions take place. (Bug 6445085)" into jb-dev