Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream

Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.

app/javascript/mastodon/features/compose/components/language_dropdown.jsx

@@ -240,7 +240,6 @@ class LanguageDropdown extends PureComponent {
     frequentlyUsedLanguages: PropTypes.arrayOf(PropTypes.string),
     intl: PropTypes.object.isRequired,
     onChange: PropTypes.func,
-    onClose: PropTypes.func,
   };
 
   state = {
@@ -257,14 +256,11 @@ class LanguageDropdown extends PureComponent {
   };
 
   handleClose = () => {
-    const { value, onClose } = this.props;
-
     if (this.state.open && this.activeElement) {
       this.activeElement.focus({ preventScroll: true });
     }
 
     this.setState({ open: false });
-    onClose(value);
   };
 
   handleChange = value => {