Merge changes from topic "am-cd88620d-8a17-4592-86c7-f98ff940a436" into ub-launcher3-master

* changes:
  [automerger] Handle null small icon am: 207f7d7f86
  Handle null small icon