Merge "surfaceflinger: prime shader cache for P3 conversion" into pi-dev