Merge "Simplify TaskManager fallback path"