Merge "surfaceflinger: layer dataspace is not a state" into pi-dev