Merge "Rewrite OutputPage::addVaryHeader"