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

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