Merge "make updateWidth aware of side margins"