Merge "[CD Cursor] Devopts override for connected displays flag" into main