Merge "RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in stealReceiveChannel" into sc-v2-dev