Merge "Fix removing callbacks from KeyguardUpdateMonitor."