Merge "TextViewTest: Fix accidental test failure on certain DPI" into sc-dev