Merge "Camera: Wire up dataSpace, clean up ICameraDeviceUser"