Merge "Simplify app prediction service check" into tm-dev