Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev