Merge "Fix bug 6596440: NPE when pulling down notification window" into jb-dev