Merge "InputDispatcher: Refactor focus logic into FocusResolver"