Merge "Turn off predictive back" into tm-dev