Merge "Add network health check watchdog triggered rollback tests" into qt-dev