3 Commits (bug/focus-within-not-cleared)