Merge "Fixed a bug where we might get stuck in a fully expanded statusbar" into mnc-dev