Merge "Fix device not rebooting after watchdog triggered staged rollback" into qt-dev