Revert "Clean up more currently unused options, add back in all sound settings"

This reverts commit 7fdc986bd3608178ed2f74f0090396df607f9c29.
Revert "Clean up"

This reverts commit 8ab3abd392d3fa7381efa7b452318de32738c4f6.
Revert "Add settings for wifi, signal text/hide, quick unlock. Cleanup a bit more"

This reverts commit 65d877940d6ce2bd0ad9db99a65f54ba5916dd80.