Merge "Camera: Add support for new zoom API"