am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev

* commit 'c2379e005d3e692d0b725c65fa842459e65ad1dc':
  Add activated text colors, update Material preference header