Merge "Fix WM missing stack/task when activity is force stopped and restarted"...
Merge "Fix WM missing stack/task when activity is force stopped and restarted" into nyc-mr1-dev am: 82c5197d
am: f478d000
Change-Id: I66b9769abc2846987377670a764d2fca8abcf2d1