Merge pull request #19448 from stangri/master-simple-adblock