Merge "Disable testTextAppearanceInSuggestionsPopup" into nyc-dev