Revert "Bye Bye Launcher3"

This reverts commit ee644d60c70c8387dc4e827266b9d172111d2251.

Conflicts:
	default.xml

Change-Id: I9b5bf090bc4fb008369bac18a545c2669d96c6c2