Bug 880588 - Don't remove inline activities when device is locked.
Merge pull request #10623 from alivedise/bugzilla/880588/inline-activity-when-locked

Bug 880588 - Don't remove inline activities when device is locked. r=timdream, a=leo+