Merge "Fix KeyguardUpdateMonitor test" into pi-dev