Ported interceptNavigation to 0.8.x