Merge "Ensure user control disabled clears stopped state" into main