Multi-user support for phones (2/2)

Conflicts:
	res/values/spirit_strings.xml