Merge "Add FeatureFlag for ENABLE_FOUR_COLUMNS."