Merge "Add additional null checks for icon fetching of archived apps." into main