Merge "Move tradeinmode wipe handling to second-stage init." into main