am 8c9a57fb: am a6e772c8: Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev

* commit '8c9a57fbce955a836e01096f44a1d6cd8b2dec75':
  Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index 7f1fea1..634270c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -83,6 +83,10 @@
             insets.top = 0;
             insets.right = 0;
         } else {
+            if (mRightInset != 0) {
+                mRightInset = 0;
+                applyMargins();
+            }
             boolean changed = getPaddingLeft() != 0
                     || getPaddingRight() != 0
                     || getPaddingTop() != 0