Merge changes from topic 'am-62871b14-7da8-4b31-b420-c5c87d1477d2' into ub-launcher3-master

* changes:
  [automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6
  Handle null background or foreground when dragging adaptive icons