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