Merge "Use TM SubId in getDataState and getDataActivity" into qt-r1-dev