Merge "Use SP for folder text size." into sc-dev