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