Merge "Move roaming icon to upper left." into pi-dev
am: 12a9f78dd8

Change-Id: I46201ac40d7934733b06cd6008883354ebfefded