Merge "Fix SVACE error in KeyboardFocusManager" into devel/master