Merge "Add feature flag for defaultRetailDemo resource." into main