Merge "Fix PackageInstaller icon resizing issue"