Merge "Fix the reboot unlock in Boottime test." into main