Merge "Fix empty notification panel." into jb-mr1-dev