Merge "Add AppPredictionServiceResolverComparator" into qt-dev