Merge "StaticLayout visual fix for maxLines"