Merge "fix iter to document close correctly" into master-skia

https://skia.googlesource.com/skia/+/449f7fcf7088bb67b86729bd4675a72c7580c443

Change-Id: Ifea0c042d5b970e05d5766f55605d8d86411f5dd