Merge "Updating IconCacheUpdateHandlerTest also fixing cached shortcut info getting invalidated on every reboot" into main