Merge "LayoutLib: Fix some rendering issues" into honeycomb