Improve FXA waits. This will make FXA run faster on login

@bobsilverberg these "ifs" are needed because the login on Developer Hub is different from Consumer Pages for now.   
Maybe it will change after Fxa goes to stage