Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev