Don't stretch the image in the media viewer

Bug: 63553
Change-Id: I06339b5559e6c8aef446de51edb82e5647369d72
Merge "Don't stretch the image in the media viewer"