Merge "Better handling of spaces at ends of lines in StaticLayout."