Merge "Fix getConnectionToSinkType for internal displays" into main