Merge "[Settings] Create a proxy for SubscriptionManager"