Merge "Add feature flag for media action button updates" into main