Merge "lib.sh: Cleanup previous /boot/efi contents" into stable/euphrates