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