Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"