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