Consolidate FxA and Persona post-login handlers (bug 1072408)