Merge "Fix NPE if pulling down QS quickly on very first boot." into jb-mr1-dev