am 2d2b2311: Merge change 3561 into donut

Merge commit '2d2b23119f1b4daa3064f065ebeb6397963c1780'

* commit '2d2b23119f1b4daa3064f065ebeb6397963c1780':
  Fix multiple strokes support when fade is disabled.