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