Revert "[WIP] PA's HYBRID SETTINGS PORTED"

This reverts commit 6e4e7660141771d6fae03e30f53b1265cf716480.

Conflicts:

	res/values/cm_strings.xml