Merge changes from topic 'am-84f3ec58-93f2-4a21-a27f-6d727311e4dc' into ub-launcher3-master

* changes:
  [automerger] Disable adaptive icon drawable parallax effect during drag and drop Bug: 34828147 am: 76bf7f3835
  Disable adaptive icon drawable parallax effect during drag and drop Bug: 34828147