Merge "Fix crash for DefaultSubscriptionController" into tm-dev