Merge "On reset, show keyguard if not already shown" into rvc-dev