Merge "Reduce the pre-watchdog timeout to be 1/4 of the full timeout" into main