a1ee172fb0
Backport #27526 by @wxiaoguang Follow #27225 The change in #27225 is not ideal, this should be the complete fix: support the layout which Fomantic doesn't support. Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>