Merge "Update DeviceState intdef to have flag = false." into main