Fix simulator detection to work with future devices, send proper deviceType with simulators