Merge "Add ROLLBACK_FAILED apexd session to StagingManager" into qt-dev