Merge "Exclude cleanup methods from CUJ for entering split select." into main