Merge changes from topic "am-096a9064-cfc3-4638-8dd5-377d3dbdbd89" into ub-launcher3-master

* changes:
  [automerger] Fixing flakiness in shape detection am: 6275b0ae7e
  Fixing flakiness in shape detection