am 1ae78c07: am c2245e1a: Merge "Workaround fading edge incompatibility with alpha modulation" into klp-dev

* commit '1ae78c07807e0db300f965bf3b0371f3eddc2d15':
  Workaround fading edge incompatibility with alpha modulation