Merge "Detect if a null ImsFeature binding crashes Telephony"