Merge "Fix InstallSource while restoring system app" into main