Merge "Fix leaking the CsdWarningDialog receiver" into main