Merge "Snoozing API changes"