Merge "Update getMergedSubscriberIds to pass subId" into qt-dev