Merge changes from topic "am-986d85fc-0e97-4cac-9bb5-144e93067776" into ub-launcher3-master

* changes:
  [automerger] Reusing the same bitmap and pixel array for shape detection am: 2e4596a448
  Reusing the same bitmap and pixel array for shape detection