Merge "[PM] Restore the PackageSetting value correctly" into main