Merge "Move roaming icon to upper left." into pi-dev