Merge "Remove unused AssistStateManager methods." into main