Merge "Fix Material Preference Framework layout" into lmp-preview-dev