Merge "Add flag for media action button placement update" into main