Merge "[SurfaceComposerClient] Avoid mSurfaceStats mutex contention" into main