am c02e6f9f: am bb1b5056: Fix material preference layouts and add a theme

* commit 'c02e6f9f7b19ef61f8c349a86e3ec54875f7cb24':
  Fix material preference layouts and add a theme