Merge "Scale up in ImageDecoder based on API level" into pi-dev