Merge "Revert "Avoid merging sections across scripts."" into ub-launcher3-burnaby