Merge "Fix for NPE in KeyguardUpdateMonitor" into main