Merge "Defer resetLockout and execute on a separate thread" into qt-r1-dev