Merge changes Ie5a1684a,I30a7d897

* changes:
  Refactor SoundEffectsHelper for asynchronous loading
  AudioService: factor out sound effects handling