cherry-pick fix for high CPU usage to branch gnome-3-36

Hello,

I would like to see the fix for high CPU usage as well on the Gnome 3.36 branch. I would be glad if you can merge this MR. Thanks for all your work!

Best