Merge "Restore saveLayer APIs back into the public API." into pi-dev