Merge "camera: Add support for logical camera"