Some changes

Conflicts:
	packages/SystemUI/res/layout/halo_speech.xml

Change-Id: I6a33d958f75c5c641d04cbd9295c0adca7e4a21e