Merge "Refactor DeviceDetection: make it OOP and extendable"