Merge "Prevent system restart while updating package during boot" into main