Do not clear combobox text unnecessarily (#10924, #11887)

Change-Id: Ica66c1d7ca05874ca5a05fb2c9651a6e4758e1d9