Merge "Prevent a larger title from displaying incompletely" into sc-dev