Added save states on screen rotation and hide-show activity