Merge "Swap exif-pixelydimension and exif-pixelxdimension messages"