Merge "Extend the watchdog timeout when calling #onUserStopped and a few other slow operations" into main