Merge "Fix a leak in HasSystemFeatureCache." into rvc-dev