Merge "Require proper DICE if StrongBox is present" into main