Merge changes from topic "empty-stack-leak"

* changes:
  Fix ReplaceWindowTests#testReplaceWindow_Dock_Relaunch() failure
  Fix two activity stack leak cases