Merge "Move cookie-blocking methods to BlockManager"