Merge "Add back removed traces for View size." into main