Merge pull request #23404 from alivedise/bugzilla/1039955/circular-activity

Bug 1039955 - Fix direct circular activity, r=etienne
(cherry picked from commit 3f59dcdb71aed7147b2b9fc3716a0d4120e22a3d)
Merge pull request #23495 from etiennesegonzac/bug-1039955-2.0-uplift

Merge pull request #23404 from alivedise/bugzilla/1039955/circular-activ...