Merge "Saturate alpha values when overlaying glyphs" into mnc-dev