Merge "Refactor simState & activeSubscriptionInfo"