Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" into jb-mr1-dev