Fixed resetting of ComboBox if focused and new items allowed (#13413).

Change-Id: Ibea81666101ff119e1b3e48726224f369e59b00f