Merge "Switch sound playing to use Camera.playSound()" into ics-mr1