am 499ea6b6: am d8dd5100: Merge "Fix several small layout and color issues"...

am 499ea6b6: am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev automerge: 21aaf98f

* commit '499ea6b6':
  Fix several small layout and color issues