Merge "Avoid crash in new SDK preview" into studio-1.4-dev automerge: 94cb585
automerge: e1b87b9

* commit 'e1b87b9289aa9080c9a5b78b539768fd9bee9df2':
  Avoid crash in new SDK preview