Merge "Camera: Add support for new camera zoom API"