Merge "Only cancel syncs for non-existent accounts" into nyc-dev