Merge "Remove some entries from install diff allowlist" into main