Add launch from home screen
Merge branch 'master' into instant

Conflicts:
	res/values/strings.xml