Merge "Fix stale inKeyguardInputRestrictedMode"