Prevent unwanted direct quit from search dialog

Also changes behavior on desktop such that window close button
mimics Android's back button.

(cherry picked from commit bc69d3ac)