Align device Id regardless of feature