Merge "Adds new AssistStateManager settings" into 24D1-dev