Merge "Allow the title of preference display in 2 lines" into sc-dev