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
am: a07b0b94
Change-Id: I3f28ebf18bf577cbbc6b2bb4a0395da39b24bbe3