Merge branch 'hotfix/1.22.1' into develop

# Conflicts:
#	db/schema.rb

db/migrate/20211122061012_add_pub_sub_token_to_contact_inbox.rb

@@ -0,0 +1,6 @@
+class AddPubSubTokenToContactInbox < ActiveRecord::Migration[6.1]
+  def change
+    add_column :contact_inboxes, :pubsub_token, :string
+    add_index :contact_inboxes, :pubsub_token, unique: true
+  end
+end