Merge "Fix missing ASL after reboot" into main