Add tracking to mapActivity, save old MapActivity