Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev