Merge "Preserve unsuspend behavior" into main