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

* commit 'fdfa106c1b4d1b457ed8ec867ce38aafed4814ca':
  More work to ensure that the wallpaper is visible before transitions take place. (Bug 6445085)