Merge change 24555 into eclair

* changes:
  Allow setting a silent ringtone (bug 1600056).