Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev