Merge "AOD: Do not show guts nor snooze" into oc-dev