Merge "Have the stable layout take into account the window's fullscreen flag." into jb-dev