Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev