Sync repo with CM

To be synced with the new features that will come, and for the new devices

Change-Id: Id1ce6c64aa825b85eb22a80938d5a93ac939a433
Track our own Launcher3

Change-Id: I48f01c82213c1206ec49c3c1004b3b5762b484bb

Conflicts:
	default.xml

Conflicts:
	default.xml