Merge "Add loading states for media changes." into main