Merge "Restore eDtaMode after NCI SetConfig"