Merge "ChangeScreen2: Auto-focus to submit button"