Merge "Requeue rather than wake when notifying."