Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or null SC" into qt-dev