Merge "Add package name to screenshot from overview" into sc-v2-dev