Merge "Moving discovery bounce logic to a separate class." into ub-launcher3-master