Merge "Fix notification panel bug which prevented proper resizing" into jb-mr1-dev