Merge "Revert "Dump ExpandableView clip bounds"" into main