Merge "Add a SubId to getDataState and getDataActivity" into qt-r1-dev