DeviceSettings changes

add bln toggle
some fixes and cleanup

sorry about the extra cherry-pick there