Merge "Fix snooze view" into sc-dev