Merge "Sync DeviceDetection with MF"