Creative and survival music cuts off if players go underwater in biomes that can play aquatic music, instead of transitioning after the previous song ends.

Repro

1. Turn Music in Music & Sounds on.

2. Wait for creative/survival music to play.

3. Enter underwater in a biome aquatic music plays.