Merge "Enforce package visibility filter on the PreferredActivities" into sc-dev