Merge "Corp badging for Recents"

diff --cc packages/SystemUI/src/com/android/systemui/recents/RecentsTaskLoader.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/recents/model/Task.java
index 189f358,9da1b47..ff062f6
--- 1/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
--- 2/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/model/Task.java
@@@ -69,13 -77,9 +77,13 @@@ public class Task 
  
      TaskCallbacks mCb;
  
 +    public Task() {
 +        // Only used by RecentsService for task rect calculations.
 +    }
 +
      public Task(int id, boolean isActive, Intent intent, String activityTitle,
                  Bitmap activityIcon, int userId) {
-         this.key = new TaskKey(id, intent);
+         this.key = new TaskKey(id, intent, userId);
          this.activityLabel = activityTitle;
          this.activityIcon = activityIcon;
          this.isActive = isActive;