Merge "Change KeyboardFocusManager to always focus when SetCurrentFocus is called...