Merge "Move timeout from RankerResolverServiceComparator to abstract class." into qt-dev