Revert "Move Status and Navigation bar options into new System bars screen"

This reverts commit 11e22c06fd7c067b57d5a1234841734eec0f6003.

Conflicts:

	res/xml/button_settings.xml