Popup: External popups no longer need custom click routing

(cherry picked from commit 39fe09ebf3d40321b7d7c389c1b5676b01093971)

Fixes gh-7367