Merge "Fix and re-enable TextViewActivityMouseTest"