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

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