Merge "Intercept clicks for non-supported split targets on workspace" into main