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

Change-Id: Ic15d15ed1750fc85cdbd3176ba0e1bb087c66dde