Merge "DeviceEffectManager: Add clang thread safety annotations" into main