Revert "[2/3] Settings: Add ActiveDisplay options via OmniGears"

This reverts commit b9a18a85996044bf27698e95fffd21dcf37a7316.

Conflicts:

	AndroidManifest.xml
	res/xml/settings_headers.xml

Change-Id: I18fdeb6cc8b457f5b65dd97cec51c2608e04b244