[251216] merge: resolve develop_si branch conflicts

Merge remote changes from gitlab/develop_si.

🤖 Generated with Claude Code

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

com.twin.app.shoptime/src/views/DetailPanel/components/THeaderCustom.jsx

@@ -93,9 +93,6 @@ export default function THeaderCustom({
           role="button"
         />
       )}
-      {type === "theme" && themeTitle && (
-      <span className={css.themeTitle} dangerouslySetInnerHTML={{ __html: themeTitle }} />        
-      )}
       {kind ? (
         ""
       ) : (
@@ -107,6 +104,9 @@ export default function THeaderCustom({
           }}
         />
       )}
+      {type === "theme" && themeTitle && (
+        <span className={css.themeTitle} dangerouslySetInnerHTML={{ __html: `[${themeTitle}]` }} />        
+      )}
       <Marquee
         marqueeOn="render"
         className={css.title}

com.twin.app.shoptime/src/views/DetailPanel/components/THeaderCustom.module.less

@@ -61,4 +61,5 @@
   color: #eaeaea;
   width: max-content;
   margin-right: 20px;
+  margin-left: 10px;
 }

com.twin.app.shoptime/src/views/DetailPanel/components/TScroller/TScrollerDetail.jsx

@@ -1,14 +1,26 @@
-import React, { useCallback, useEffect, useRef, useState, useMemo, forwardRef } from 'react';
+import React, {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 
 import classNames from 'classnames';
 import { useSelector } from 'react-redux';
 
-import { off, on } from '@enact/core/dispatcher';
+import {
+  off,
+  on,
+} from '@enact/core/dispatcher';
 import { Job } from '@enact/core/util';
 import Scroller from '@enact/sandstone/Scroller';
 import Spotlight from '@enact/spotlight';
 
-import AutoScrollAreaDetail, { POSITION } from '../AutoScrollAreaDetail/AutoScrollAreaDetail';
+import AutoScrollAreaDetail, {
+  POSITION,
+} from '../AutoScrollAreaDetail/AutoScrollAreaDetail';
 import css from './TScrollerDetail.module.less';
 
 /**
@@ -206,7 +218,8 @@ const TScrollerDetail = forwardRef(
           onScrollStop={_onScrollStop}
           onScroll={_onScroll}
           scrollMode={scrollMode || 'translate'}
-          focusableScrollbar={focusableScrollbar}
+          // focusableScrollbar={focusableScrollbar}
+          focusableScrollbar={false}
           className={classNames(isMounted && css.tScroller, noScrollByWheel && css.preventScroll)}
           direction={direction}
           horizontalScrollbar={horizontalScrollbar}