Merge "Keyguard: Fix threading issues in KeyguardUpdateMonitor" into pi-dev