Merge "Move editing from long press to edit button" into nyc-dev