Merge "Restore default focus to input." into main