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

* commit '69a62a8b0df71b0a26d55c29c71dd311dbe174c7':
  Update preference dialog padding to Material