am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev
automerge: eb6f3f8

* commit 'eb6f3f885154914eec6a747265d1f568ae50380c':
  Update preference dialog padding to Material