Merge "Update watchdog logs to backoff if logs stuck" into main