Merge "Keep finalized staged sessions in session database" into qt-dev