Merge "Strengthen dataspace guarantees in SurfaceFlinger." into udc-dev