[merge] Fix room summary preview mismerge

Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt

@@ -35,6 +35,7 @@ object RoomSummaryConstants {
             EventType.REACTION,
     ) +
             EventType.POLL_START.values +
+            EventType.POLL_END.values +
             EventType.STATE_ROOM_BEACON_INFO.values
 
     // SC addition | this is the Element behaviour previous to Element v1.0.7
@@ -57,6 +58,7 @@ object RoomSummaryConstants {
                 EventType.STATE_ROOM_CREATE
     ) +
             EventType.POLL_START.values +
+            EventType.POLL_END.values +
             EventType.STATE_ROOM_BEACON_INFO.values
 
     // SC addition | no reactions in here

vector/src/main/java/im/vector/app/features/home/room/list/usecase/GetLatestPreviewableEventUseCase.kt

@@ -49,7 +49,7 @@ class GetLatestPreviewableEventUseCase @Inject constructor(
                     ?: getLiveVoiceBroadcastEvent(room)
                     ?: getDefaultLatestEvent(room, roomSummary)
         } else {
-            roomSummary.latestPreviewableEvent
+            roomSummary.scLatestPreviewableEvent()
         }
     }