Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev