Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev