Merge "Add in/out ColorSpace to ImageDecoder" into pi-dev