Merge "Deprecate unused intent extra." into main