am 585b764a: Merge "Revert "Avoid merging sections across scripts."" into ub-launcher3-burnaby

* commit '585b764ae24c7869704c428d1739e151e989674d':
  Revert "Avoid merging sections across scripts."