Merge "Improve FocusFinder for RTL support"