Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev
am: 69ec1673df

Change-Id: I825f94150e349465d4dd9168ab18d8f03fc9ed73