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

Change-Id: I0c056310d4ab13d2ccc69763a8676469ada1f193