Fix new_user KPI for two scenarios:

@kparlante - mind reviewing?

* FirefoxOS was not reporting new users
* If a user hits cancel from the "set password" screen.

fixes #3359
fixes #3459