Merge "Fix WM missing stack/task when activity is force stopped and restarted" into nyc-mr1-dev