Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev