Merge "Minimize tasks moving back with back nav." into main