Merge "Improvements to notification/settings panels:" into jb-mr1-dev