Merge change I490e01ba into eclair

* changes:
  Fix issue #2174566: HOT STABILITY: NPE in activity manager