Merge "Default to using wrap content for row height."