Merge "Disable unlocked boot & non-normal DICE test" into main