Merge "Pause watchdog triggering on the main thread during package scan" into qt-dev