Fixed kill and restart on orientation change in activity