Merge "Increase timeout for OnSubscriptionsChanged."