Merge "Fix a bug where the running task would be drawn below recents task" into main