Several small fixes
Merge branch 'beta' of github.com:intercom/intercom-ios into beta