Settings Update
  * Give HALO and PIE Controls their own category
  * Volume rocker controls moved from lock screen to sound
  * Re-order settings layout

Conflicts:
	src/com/android/settings/SoundSettings.java

Change-Id: I6c3212ae3440693a6b31ec35e2f0319c7fbce0be
tabui crash fix, gaps & re-order

Change-Id: I6e577b5b4c5cdf4156a1aa95653dad22dfd66c97