Merge "Deduplicate resumption controls when notif removed" into rvc-dev