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

* commit '8c08fc27bba86f92773a5bcb0a14e8e4e03e5de1':
  Work around nested SaveLayerAlpha bug