Make ComboBox always immediate (#4054)

Change-Id: I34525b7d9e78ede7f9533869326ca0c08474963a