Moved mDeviceId from Device to Activity