Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c am: 0bd1f34c am: 76f4dd76 Change-Id: Ide7d5d3aedaf4284f7b16df1d07149cd7aec5a2d