Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev