Merge change 4112 into donut

* changes:
  Fix bug #1812041: activity manager crash with bad args.