Merge "rename roaming notification" into pi-dev