Change forceUpdate flag to always force recalculation of width. Fix tests. (#13444)

Change-Id: Ie666e2867908160b1544d3bf8251802ea771660f