Merge "Minor cleanups around color usage" into lmp-dev