Merge "Make AppPredictor thread-safe" into tm-qpr-dev