am 6f25a33b: am 6a377f30: Merge "Fix glitch when using settings pulldown then switching to notifications." into jb-mr1-dev

* commit '6f25a33b6ee8084c831f93a33a7a50c91f53c45e':
  Fix glitch when using settings pulldown then switching to notifications.