Merge "Fix warning: list conflicting ids (not cameraId)"