Merge "Fix activity start over Keyguard" into oc-dr1-dev