Merge "Persist destroyed staged sessions until they are cleaned up" into qt-dev