Merge change I19f2928b into eclair

* changes:
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.