Merge "Fix KeyboardFocusManager custom algorithm reset" into devel/master