am f88eb303: am a0f63bf9: Add null checks in CallFeaturesSettings

* commit 'f88eb30396cdc105efe31a584896ed2bac5cb393':
  Add null checks in CallFeaturesSettings