Prevent race condition causing marshaller to not be registered

Only happens sometimes and only on super fast phones.

Change-Id: Id73c3f2b2e65fdfc234d6492fc240ff55d210117