Merge "Fix test issues with media3 buttons" into main