Merge "Added StackId object for checking what features a stack supports"

diff --cc core/java/android/app/ActivityManager.java
Simple merge

diff --cc core/java/android/view/Window.java
Simple merge

diff --cc core/java/com/android/internal/policy/PhoneWindow.java
Simple merge

diff --cc core/java/com/android/internal/widget/NonClientDecorView.java
Simple merge

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

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

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

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

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge

diff --cc services/core/java/com/android/server/wm/Task.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge