Removed all references to me and re-added timeout for navToFirstAvailableWindow.