am bb1b5056: Fix material preference layouts and add a theme

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