Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev