Merge "media: Populate Image scaling mode in reader and writer" into pi-dev
am: 893c5e0c70

Change-Id: I621de034e46a88b3e5bedb886a1deae4c356ed66