Make ActivityStack hacks more conservative with their mutual exclusion, as was before.

Change-Id: I30bc63337087e198701d3f89e44e80bb22e30f1e
Merge "Make ActivityStack hacks more conservative with their mutual exclusion, as was before." into jb42