Redesign settings on tablets am: 86f2a86b99
am: ae23161a0e

* commit 'ae23161a0e2bb403239723e2ac980ad0d0a1fa46':
  Redesign settings on tablets