Merge "Fix suggestion window issues." into nyc-dev