Merge "Adding width and height into screenshot metadata"