Merge "Eliminate wallpaper exposure during transition." into jb-dev