Merge "Fix the smallest width not updated while resolving override bounds" into tm-qpr-dev