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

Change-Id: Ibb932b650d94435513acb08d86eedc4885a0a135