Merge "Make TextViewActivityTest stable by sleeping between clicks." into nyc-dev