Merge "Do not notify SS change with invalid subId"