Merge "Remove X-Content-Dimensions header"