Merge "Support Desktop unminimize animations, and move app-state logic" into main