Merge "Prevent KeyguardContainer size from shrinking when switching from Password Security Challenge." into rvc-dev