Merge "Layoutlib fixes for L"