Merge "Add additonal logging around user switching in KeyguardUpdateMonitor" into udc-qpr-dev