Merge "Make sure always reuse ApplicationInfo when generating ProviderInfo" into rvc-dev