[automerger skipped] Merge "Pause watchdog triggering on the main thread...

[automerger skipped] Merge "Pause watchdog triggering on the main thread during package scan" into qt-dev am: a9ab8516 am: 4d8e3465
am: b9da94da -s ours
am skip reason: change_id Ia5b2b5741194a33f7cd09e79c0904696ce546026 with SHA1 e5cc6abd is in history

Change-Id: Icf7fee606e3c657462bcce09455f1ebcb6a9300f