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

Change-Id: Ieb53ea67b9358dcdf732bf2959b4d015f1975441