Merge "Add new feature flags for the safer intents project" into main