Merge "Extend the watchdog timeout when calling #mount operation" into main