Merge "PhoneStatusBar: Fix NPE while accessing quick settings." into jb-mr1-dev