Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46
am: 0bd1f34c47

Change-Id: Iffdde7a0d291a3eac2d7442273b8bf1b2b7e0346