Merge "Camera: API1: Improve ZSL mode activation heuristics" into nyc-mr1-dev