Bug 1017022 - Call close() on a valid object. r=jgriffin, a=test-only
Bug 1003707 - Retain size information for similar surfaces if we can. r=roc, a=lsblakk