Merge changes from topic "am-60382f80-140d-4281-b905-99472c404e5b" into ub-launcher3-master

* changes:
  [automerger] Increase DELAY_MS for DiscoveryBounce. am: 8d945e497f
  Increase DELAY_MS for DiscoveryBounce.