Merge "Use file width/height instead of metadata for getContentHeaders" into wmf...