Merge "Add null check to RadioInterfaceCapabilityController"