Allowing injecting a client

I've been having problems with GCM timeouts, this allows me to configure a
client with a reasonable timeout and inject it
Merge branch 'inject-browser' into cc