Merge "Fix visibility and add bouncer event in KeyguardUpdateMonitor"