Bug 1054184 - Don't clear active targets right away
Merge pull request #23258 from timdream/keyboard-switch-fail

Bug 1054184 - Don't clear active targets right away, r=rudyl