Refactor suspend issue to guard against recreation of the activity