Merge "Changes following "Remove API to set if a geometry requires writing to the...