am cf225194: am a763bb83: Merge "Saturate alpha values when overlaying glyphs" into mnc-dev

* commit 'cf225194a61db1558ead673fd67365ff9a61f3bb':
  Saturate alpha values when overlaying glyphs