Optimizing icon paths for packaged apps
merge upstream changes