Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev