xdg-shell: improve unmapping logic slightly

Renamed unmap/reset functions to represent their purpose better, shuffled some logic around to make !4043 (merged) diffs nicer.

Should work exactly in the same way.