Merge "Check user when snoozing" into sc-qpr1-dev