Merge request: fix #902362, #902137, #836062 and #925338

As indicated on debian-xfce@lists.debian.org, I have started triaging and fixing some xfce4-session bugs.

This initial MR includes fixes for #902362, #902137, #836062 and #925338 as well as a few other cleanups as detailed in d/changelog.

Thanks for reviewing