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

Change-Id: I360bce398225ee78979a50e8a89c71f7e9506b82