Cherry-picks for 41.1

Florian Müllner requested to merge fmuellner/gnome-shell-extensions:for-41 into gnome-41 Dec 11, 2021