Merge "Fix TextViewTest.testFallbackLineSpacing on small devices"