Merge "SurfaceControl: C++ Binding Lifetime refactoring"