Bug 947029 [B2G][Gallery][Small images]Extremely small images display in gallery with a larger than expected thumbnail
Fixed merge issues