Merge "Make sure we turn off trade-in mode" into main