Merge "Merge "Force status bar window to be visible when expanded" into nyc-dev am: 4b4e814533 am: e96abdba90" into nyc-mr1-dev-plus-aosp