Merge "Wait until activity present before calling onEndTargetCalculated()" into ub-launcher3-rvc-qpr-dev