Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev