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

Change-Id: Ie86066cc7162620d5d89b20d5c1b92910f6c9766