Merge "Fix bug #6213159 FocusFinder should be able to take care of Views direction"