[automerger skipped] Merge "Pause watchdog triggering on the main thread during package scan" into qt-dev am: a9ab8516ca
am: 5dc10505c1 -s ours
am skip reason: change_id Ia5b2b5741194a33f7cd09e79c0904696ce546026 with SHA1 ab2fc348fd is in history

Change-Id: I8634f498df9a79db4997fce5901f99c05fdb241f