Reword code in CalcWindowAutoFitSize() to match the order used in size_desired calculation. Should be no-op. Toward (#9352)