Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev