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