Merge "Temporary debug to figure out who's calling start twice" into nyc-dev