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

Change-Id: I7794e3dc60fb6379b1c3c3c7400be61e45c9a301