Merge "Set focus to field being edited after changing type Bug: 1382329"