Merge "rename roaming notification"