Merge "Clear startingDisplayed flag when removing window." into jb-dev