Merge "surfaceflinger: fix screenshot dataspace under WCG" into pi-dev