Merge "Ship Music2, not Music Bug: 9518830"