am 58defc8e: am 9007619d: Merge "Shutter sound is heard at the end of the...
am 58defc8e: am 9007619d: Merge "Shutter sound is heard at the end of the recorded video" into jb-mr1-dev
* commit '58defc8e':
Shutter sound is heard at the end of the recorded video