Merge "Preserve active staged sessions." into qt-dev