Merge "Fix camera launch delay from Keyguard" into oc-dev