Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev