Revert "Correct ComboBox display ( Do not change when updating tracking control )"

This reverts commit e151afcab126be330a9d0ce2ab3cea3e869c3477.