Merge "Prevent autobinding ProviderWatcher abuses" into main