Merge "Check for null parent when migrating SurfaceControl" into rvc-dev