Merge "Fix bug where a starred contact couldn't be removed" into nyc-dev