Merge "Accommodate Changes for Music 2.4.x"