Merge "LayoutLib: use the new expand API."