Merge "Use keyguard state directly instead of trying to remember it" into rvc-dev