Merge "Preserve active staged sessions." into qt-dev am: ea38c4fa56
am: a5e21f0212

Change-Id: I2f937e2f063169fe1c976da59d70084fcdeb9206