Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev