Merge "Add snooze options setting" into qt-dev
am: f6f26e0447

Change-Id: I97dd2a7683f754854da29c955fee6fea15eac98c