Merge "Persists the master mute volume setting." into ics-aah