Merge "Setting Redesign (Part 1)" into ub-contactsdialer-a-dev
am: c028a5a4c8

* commit 'c028a5a4c8abcd37b62a59a70333fdaed446e7d1':
  Setting Redesign (Part 1)