Merge "Dispatcher: refactor getWindowHandleLocked and StrongPointerHash" into sc-dev