Merge "[SurfaceFlinger] Resolve deadlock in SurfaceTracing." into rvc-dev