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