Merge changes from topic "am-6122ccdb-5b5a-43f4-8f32-3d9e1a775ee9" into ub-launcher3-master

* changes:
  [automerger] Set correct target position for other targets am: 707c09d3e3 am: 8c7e5cb111
  [automerger] Set correct target position for other targets am: 707c09d3e3
  Set correct target position for other targets