Merge "camera2: Add support for logical camera"