Merge "Add test for null-pointer in ZenModeHelperTest"