Merge "Fix NPE when getting app icons"