Merge changes from topic "am-f1734de0-a8c9-409e-bd1b-c22b2df61ce2" into ub-launcher3-master

* changes:
  [automerger] Skip processing fallback icons as they are already badged and have shadow am: fbf327f9
  Skip processing fallback icons as they are already badged and have shadow