Merge "Explicitly invoke keyguard for visibility test" into oc-dev