More fixes

Change-Id: I445d619cbdfcf840984b2f55e807344481c32d8f
Merge branch 'original/jb43'

d4949f6c449cc4eb59297f729ef41e9854d7f
Signed-off-by: Evan Anderson <evan1124@gmail.com>

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