Merge "Force status bar window to be visible when expanded" into nyc-dev