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