Merge "Restricts callers to fetch activity icons for their own apps" into main