Merge "Finish up Intent identifier implementation." into qt-dev