Merge "Changing the way the media image scales" into oc-dr1-dev