Merge "LayoutLib: Misc rendering fixes."