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