Merge "Fix failing/flaky TextViewActivityTests"