Merge "[bc25] Support dual shade transitions in MediaContentPicker." into main