Merge "[CD Cursor] Apply selection logic to change cursor displayId" into main