Merge "Make TextViewActivityTest stable"