Launcher3 -> Trebuchet

Change-Id: I3b77b7d0e5289b567c6a1dfe7cd14f1d4372e487

Conflicts:
	default.xml