Merge "Always confirm eSim removal." into main