Merge "Add activity details to the ManifestInfo" into idea133
 Auto-merge: 3ce7789

* commit '3ce7789f80db952bb80235f893b0e9fd238a317f':
  Add activity details to the ManifestInfo