Merge "SF: Fix thread safety in ISurfaceComposer APIs" into rvc-dev