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

* commit 'f918444fdd34183c2577efe05a05ad3a0cdaba27':
  Work around nested SaveLayerAlpha bug