am cf7f3b6b: am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev automerge: 0aaebd4

* commit 'cf7f3b6be252f313536e58cc62763075d4f45e5a':
  Fix Material styling in remaining dialogs and layouts