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

Change-Id: I742efbdc2ac20ab2373089975505bac66f273b81