Merge "[CD Cursor] Fix invalid displayId set when topology is not yet set" into main