Bug 1020002: don't allow an activity choice that could subvert forward-lock
Merge pull request #20093 from davidflanagan/bug1020002-v1.3

Bug1020002 v1.3