Revert "Revert "PIE Derps""

This reverts commit 17006ae3390fc3c8aee0119dc4a255ab9c9a3f33.

Conflicts:
	res/xml/settings_headers.xml
System ui move