Merge "First commit for FoldingLayout."