Merge "SF: Enforce thread safety for SurfaceFlinger class" into rvc-dev