Merge "Remove unused resources for split screen handle" into main