Merge "Refine the condition about force layout" into sc-dev