Merge "Add snooze options setting" into qt-dev