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

Change-Id: Ibdef2a1f52a7f661f064024ed14f17267e75d978