Merge "Revert removal of Material color values for now." into lmp-dev