Merge "Revert "Ship Music2, not Music""