Merge "Adds new AssistStateManager settings" into main