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