Merge "Null check for early watchdog-caught thread hangs" into qt-dev