Merge "Revert "Rollback package after reboot has been performed"" into main