Merge remote-tracking branch 'upstream/stable-4.4' into HEAD

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.

spec/requests/api/web/push_subscriptions_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe 'API Web Push Subscriptions' do
     end
   end
 
-  describe 'PUT /api/web/push_subscriptions' do
+  describe 'PUT /api/web/push_subscriptions/:id' do
     before { sign_in Fabricate :user }
 
     let(:subscription) { Fabricate :web_push_subscription }