Merge "Prepare code to allow image decoder to be reused" into pi-dev