DeviceSettings: add settings for new s2w/dt2w

Change-Id: I87db0c310b4da35b1836ceb804d272189ed735c0