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

Change-Id: I0e0d6fac50335a93b5ee15af75096d7db0389a70