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

Change-Id: I42e649ee3a8362a5634ef57abf2463621ccd06ec