re-add upstream Settings, remove SamsungServiceMode