Merge changes from topic "am-867e2786-be21-4b74-9b70-58c094fa1f0d" into ub-launcher3-master

* changes:
  [automerger] Creating some common launcher targets am: 9fc97976e0
  Creating some common launcher targets