Close only combobox on escape, not the window (#12163)

Change-Id: I356e115b5cd96ba0a598178a15215654f2fd16bb