Merge "Disable TextViewActivityMouseTest#testContextMenu" into nyc-dev