Merge "Skip bootloader update" into main