am d6850edf: Merge "Avoid merging sections across scripts." into ub-launcher3-burnaby

* commit 'd6850edf87c34134fa3a4c6145e221d7dc0f9d70':
  Avoid merging sections across scripts.