VolumePanel: Merged updates from cm-10.1 branch of CyanogenMod