Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev