Merge "Work around nested SaveLayerAlpha bug" into klp-dev