Merge "Replacing SimPortInfo.portState enum with portActive flag"