topic picking: merge topics on the same branch as cherries

Change-Id: I484eb18cf6088bf19bf1bd9bc7fee1f3eeb40644
Merge "topic picking: merge topics on the same branch as cherries" into pac-4.4