Merge "Fix NPE." into jb-mr1-dev

Author: Hiroshi Lockheimer

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java

@@ -121,7 +121,9 @@ public void onDraw(Canvas canvas) {
     }
 
     public void cancelExpandHelper() {
-        mExpandHelper.cancel();
+        if (mExpandHelper != null) {
+            mExpandHelper.cancel();
+        }
     }
 }