Bug 877849 - Refactor & test GA event tracking/timeout functionality