Merge "Consolidate settings for Assist." into main