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

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