Bug 956938 - Fix active activity
Merge pull request #15764 from alivedise/bugzilla/956938/fix-activie-activity

Bug 956938 - Fix active activity