[gh-5] Add back width/height autofill changes that were wiped out in upgrade

Were wiped out in 20952794