Merge "Reattaching and dismissing notifications when detached." into main