Merge "Do not override mColor with default color if none set" into lmp-preview-dev