Merge "surfaceflinger: fix color tranform matrix races" into pi-dev