Merge changes from topic "am-17d9128f-860a-478b-b599-8befd413609c" into ub-launcher3-master

* changes:
  [automerger] Simplifying some package matching code by using common itemInfo mathcher am: 6e13dd3aa8
  Simplifying some package matching code by using common itemInfo mathcher