Set state correctly on unpause
Google Drive + big refactor