Merge "Shrink top padding of suggestion container." into nyc-dev