Merge branch 'master' into beta

# Conflicts:
#	__tests__/containers/List/__snapshots__/List.stories.storyshot
#	__tests__/containers/SearchBox/__snapshots__/SearchBox.stories.storyshot
#	__tests__/containers/TextInput/__snapshots__/TextInput.stories.storyshot
#	android/app/build.gradle
#	android/build.gradle
#	app/containers/TextInput/TextInput.stories.tsx
#	app/containers/message/Audio.tsx
#	app/lib/methods/audioFile.ts
#	app/views/CreateChannelView/index.tsx
#	app/views/DefaultBrowserView/index.tsx
#	app/views/NotificationPreferencesView/index.tsx
#	app/views/RoomMembersView/components/ActionsSection.tsx
#	app/views/RoomMembersView/index.tsx
#	e2e/data.ts
#	e2e/data/data.cloud.ts
#	e2e/data/data.docker.ts
#	e2e/helpers/data_setup.ts
#	e2e/tests/assorted/07-changeserver.spec.ts
#	e2e/tests/assorted/11-deeplinking.spec.ts
#	e2e/tests/onboarding/05-login.spec.ts
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/AppDelegate.h
#	ios/RocketChatRN/AppDelegate.mm
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	yarn.lock