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