Merge "Update preference dialog padding to Material" into lmp-mr1-dev