More improvements to Device Tools

TODO: Add Samsung device settings prefs