Fix a queryOptions problem that occurs when a FilteringSelect loses focus and does a store lookup.
Fixes #17434, refs #12373.
(cherry picked from commit 2253d0eb61e178fce92d4b9bb68aaad7ad3cade3)
Treat a click on the scrollbar in the popup wrapper as a click on the popup.
Fixes #17435, refs #10631.
(cherry picked from commit 2053e081697a4abe3f1b8f2def8b9b040723ebc4)