Merge "Clean up X-Content-Dimensions"