Merge "Clear PredictorState targets when it's re-registered" into tm-qpr-dev