MOBILE-312 Fix invalid detection of device