Treat initial rendering and style changes separately. (#13444)

This fixes a regression caused by a previous patch, which led to empty comboboxes being initialised with a zero width. 


Change-Id: I7e5ca0c563625c453e0e3006d91ed52ad227d6f0