Force recalc of width when the ComboBox style has changed  (#13444)

Change-Id: I7bb500c1b64502881824875e967cf43c5e49a999