Merge "Add watchdog triggered staged rollback test" into qt-dev