Merge "Fix SubscriptionInfoListViewModelTest" into main