Merge "Add a small delay for scheduling idle while sleeping" into main