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

* commit '21aaf98f6fc666dcd2dad43c368038d441fefbb2':
  Fix several small layout and color issues