Merge "Add support for saveLayer()."