Merge "Clear package from disallowed NLS filter only on remove" into main