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

Change-Id: I7b613ca29e28ee0ccbd35e800a2ba315b044b774