Merge "Revert "Create token for all nested intents of a top level intent."" into main