Correct user check for focus()
Merge branch 'bug/stolen-focus-on-grouping-43232067' into development