Merge "Fix use after free in InputClassifier"