This merge request makes a few fixes to ensure the session doesn't exit until all systemd user services are exited.