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

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