Merge "SF: Restore geometry state when it had been overridden" into sc-dev