Merge "fix(xlat): change MT_DEVICE to map to nGnRnE" into integration