Merge "TextClassifier cross-user vulnerability in direct-reply"