Simplify popup buffer quit/restore using `quit-window'.
Merge branch 'popup-refactor'