Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-dev

* changes:
  Remove callback before WindowState removal
  Improve startBackNavigation stability