Merge "Fix AppPredictionService callbacks comparison" into tm-qpr-dev