Merge "Fix NullPointerException in ZenModeHelper"