Merge "Remove unused argument LayoutOverhang"