Merge "Revert "Only display single line for title"" into sc-dev