Merge "Clean-up starting window if resuming activity in another stack" into nyc-dev