Make start-user-session.service shutdown friendly