Merge "Null-pointer check when updating name of ZenRule." into oc-mr1-dev