CB-2344 fixing deviceReady event not firing