Make sure notifications has loaded click tracking code

I've seen a few issues with errors thrown so let's be more explicit
with dependency here.

Change-Id: I8d435266f16114bd7581fa21b82ff4ddc72b02d9
Merge "Make sure notifications has loaded click tracking code"