Merge "Cleanup task view when bubble is removed" into main