Merge "Fix KeyboardFocusManager ClearFocus bug" into devel/master