Bug 956938 - Fix active activity reference
and remove the activity window correctly when there is multiple inline activities
Merge pull request #15793 from alivedise/bugzilla/956938_v1.3/active-activity

Bug 956938 - Fix active activity reference