Merge changes from topic "am-3c12c8f9-2db3-416e-bdb0-ecff99a348e9" into ub-launcher3-master

* changes:
  [automerger] Adding some activity state information in dump am: e43d00db40
  Adding some activity state information in dump