Merge "Check if the SubscriptionsChangeListener has been started before stop"