Merge "Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup." into udc-dev