Merge "Delete old WifiNotificationController strings."