Merge "Consolidate settings for Assist." into 24D1-dev