Recompute ComboBox selection when adding/removing items

So you don't need a dummy call to onInputChange() to get
this to happen.

Change-Id: Idcbf38c5329cb63f06f5da0a83b1503b5db6ac13
Merge "Recompute ComboBox selection when adding/removing items"