Merge "Allow pausing Watchdog on the current thread" into qt-dev am: 3dc28cb1dc
am: 43a000addf

Change-Id: I378242216fcffefd29875eef69487b798ed41a2d