Merge "Partial revert of keyguard checks" into rvc-dev