Merge "Do not notify SS change with invalid subId" into qt-r1-dev