Return to the old-fashioned device settings option

And move headset connect option to sound settings

Change-Id: Id4325d1e135a8ebaa309e1c5ef95c042538cea56