Fix Location and Activity Update start/stop