Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0