Merge "[WifiNotification] Only clean up the notification from Wifi" into sc-dev