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

* commit 'c2245e1ac7b4419936e9891113d9c1e7ea7d65d4':
  Workaround fading edge incompatibility with alpha modulation