Merge "Fix failing TextViewTest#testTextAttr" into lmp-dev