Merge "Add eSIM directory and disable bootstrap when bootloader is unlocked in user build" into main