Merge "Increase DELAY_MS for DiscoveryBounce." into ub-launcher3-edmonton