Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev