Merge "Make Watchdog request timeout flag configurable" into qt-dev