Merge "Suppress horizontal scrolling with trailing blanks"