Merge "On device lockdown, always show the keyguard" into rvc-dev