It not worth to merge, it is change specifically for "Quantum Resource Distribution" - so parent surface and factory surface have shared quantum storage - it's issue because QRD made compatible with Space Exploration and do not allow inter-surface transportation, but factory is another surface too.
So there are changed internal surface naming to distinguish "planet" surface and "factory" surface that build on that planet.
local surface_name = global.last_non_factory_surface..'|factory-floor-' .. global.next_factory_surface
-- local surface = game.surfaces[layout.surface_override or surface_name]
local surface = game.surfaces[surface_name]