Merge "Hide "Remove" menu & the drag handle when there's just one locale" into nyc-dev