Merge "Fix a regression in activity manager regarding killing stopped processes."