Merge "Rename enableNrDualConnectivity"