default.xml: switch to my device and Phone repo, minor changes