Merge "Fix handling multiple staged rollback sessions ready signal" into qt-dev