Merge "cameraserver: Check for dataspace override during finishConfiguration."