Focusing on a text input when navigating to a new screen only works when adding to the stack, not when going back.

Focusing on a text input when navigating to a new screen only works when adding to the stack, not when going back. #8719