Merge "Fix CUJ UiThread detection when only a SurfaceControl is provided" into main