Merge "Remove lingering content overlays in onTaskVanished" into tm-dev