am 6fbd4829: Merge "Work around nested SaveLayerAlpha bug" into klp-dev

* commit '6fbd4829a9614f0d6c668cd5ccba6cabdaeb81a0':
  Work around nested SaveLayerAlpha bug