Merge "Update SubscriptionController on NOT_READY only if it is terminal state." into sc-dev