Merge "Use bitset api in InputClassifier" into qt-dev