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