Merge branch 'master' into 4.47.1-master

# Conflicts:
#	android/app/build.gradle
#	app/i18n/locales/ar.json
#	app/i18n/locales/bn-IN.json
#	app/i18n/locales/de.json
#	app/i18n/locales/en.json
#	app/i18n/locales/es.json
#	app/i18n/locales/fi.json
#	app/i18n/locales/fr.json
#	app/i18n/locales/hi-IN.json
#	app/i18n/locales/hu.json
#	app/i18n/locales/it.json
#	app/i18n/locales/ja.json
#	app/i18n/locales/nl.json
#	app/i18n/locales/pt-BR.json
#	app/i18n/locales/pt-PT.json
#	app/i18n/locales/ru.json
#	app/i18n/locales/sl-SI.json
#	app/i18n/locales/sv.json
#	app/i18n/locales/ta-IN.json
#	app/i18n/locales/te-IN.json
#	app/i18n/locales/tr.json
#	app/i18n/locales/zh-CN.json
#	app/i18n/locales/zh-TW.json
#	app/views/ChangeAvatarView/index.tsx
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	scripts/organize-translations.js

app/views/ChangeAvatarView/index.tsx

@@ -162,15 +162,13 @@ const ChangeAvatarView = () => {
 		<KeyboardView
 			style={{ backgroundColor: colors.auxiliaryBackground }}
 			contentContainerStyle={sharedStyles.container}
-			keyboardVerticalOffset={128}
-		>
+			keyboardVerticalOffset={128}>
 			<StatusBar />
 			<SafeAreaView testID='change-avatar-view'>
 				<ScrollView
 					contentContainerStyle={sharedStyles.containerScrollView}
 					testID='change-avatar-view-list'
-					{...scrollPersistTaps}
-				>
+					{...scrollPersistTaps}>
 					<View style={styles.avatarContainer} testID='change-avatar-view-avatar'>
 						{deletingRoomAvatar ? (
 							<AvatarPresentational