Merge "Layoutlib fixes for L [DO NOT MERGE]" into lmp-preview-dev