Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into t3chguy/wat/230.1

# Conflicts:
#	src/components/views/settings/CryptographyPanel.tsx
#	test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap

src/components/structures/RoomSearch.tsx

@@ -62,7 +62,7 @@ export default class RoomSearch extends React.PureComponent<IProps> {
         );
 
         return (
-            <AccessibleButton onClick={this.openSpotlight} className={classes}>
+            <AccessibleButton onClick={this.openSpotlight} className={classes} aria-label={_t("action|search")}>
                 {icon}
                 {!this.props.isMinimized && (
                     <div className="mx_RoomSearch_spotlightTriggerText">{_t("action|search")}</div>