Merge "Replace Null Returns with EmptyList in SubscriptionManager" into main