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

and changed missed in rebase. These lines had moved to ios-hybrid.