am 95b26e1a: Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1

* commit '95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5':
  Overhaul vibrate and silent settings to match hard keys.