Backport #27323 by @wxiaoguang
Fix#27313 (see the comment)
And some UI improvements:
### Before


### After



Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>