Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev