Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1