Merge "Add `featureFlag` manifest attribute" into main