Merge "Fix bug of permanently deleting SmsProvider rows doesn't work."