Merge "Add activity details to the ManifestInfo" into idea133