Merge changes from topic "am-cfb119a9-e136-408a-8dd7-0b690e3a6793" into ub-launcher3-master

* changes:
  [automerger] Prerequisites for TAPL am: 74c261c89f
  Prerequisites for TAPL