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

Change-Id: I9ba5ab7ac1282e15b3da00a738e2bfdcddf2ea07