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