Merge "LayoutLib: Misc fix to rendering."