Merge "Change text colors to reflect their state" into lmp-mr1-dev