Merge "New camera sounds" into jb-mr1-dev