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