am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev

* commit 'd8dd5100f453b0e82b75c56651889eca03414696':
  Fix several small layout and color issues