Return to the old-fashioned device settings option

And move headset connect option to sound settings

Change-Id: I862bce2aa406b9153dba243abca71421e0f08929