Merge changes from topic "am-71b42e3a-02e4-4dc2-9f82-6d74158b505a" into ub-launcher3-master

* changes:
  [automerger skipped] [DO NOT MERGE] Fix clipping issue on adaptive icons skipped: 34973c93e4
  [DO NOT MERGE] Fix clipping issue on adaptive icons