Merge "Update the src to use newly added feature flag instead." into main