Merge "Ignore revealKeyguardIfBouncerPrepared request if Bouncer is null." into rvc-dev