Merge "Revert "SF: Test coverage for OutputLayer::updateGeometryState""