Merge "Keep finalized staged sessions in session database" into qt-dev
am: 141d330086

Change-Id: I40f6298968a83d82cf5be9df43ff074496eb94b4