Merge "Only call reset() when transitioning to a State that doesn't have RecentView visible" into main