Show volume control when adjusting sound mode

Change-Id: Ibff4d038f4985e4e4e00af9d1178828ca2edf5b9
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7