Merge "Dump ExpandableView clipping from ENR" into main