Merge "Fix status bar not hiding quickly" into oc-dev
am: b0806f1006

Change-Id: Ie20ce6f63587222c2c0552078cf2846534cfa4c7