Merge "Re-Add a flag to Enable Carrier N1 Mode Control" into main