Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev