Merge "Do not use getPackageContext where Icon.createWithResource just extracts the packageName" into sc-dev