Merge 4.25.0 into master (#3789)

.circleci/config.yml

__tests__/Storyshots.test.js

__tests__/__snapshots__/Storyshots.test.js.snap

android/app/build.gradle

app/AppContainer.tsx

app/ReactotronConfig.js

app/actions/actionsTypes.ts

app/actions/activeUsers.ts

app/actions/app.ts

app/actions/connect.ts

app/actions/createChannel.js

app/actions/createChannel.ts

app/actions/createDiscussion.js

app/actions/createDiscussion.ts

app/actions/customEmojis.js

app/actions/customEmojis.ts

app/actions/deepLinking.js

app/actions/deepLinking.ts

app/actions/encryption.js

app/actions/encryption.ts