Merge "Make Native Watchdog trigger RollbackManager rollback" into qt-dev