Bring in Music toggle from ICJ42 source

Change-Id: I0a5218c80b7aadead24fcad0fe64a2cbcbc39cf2