Merge "Refactor input dispatcher use of window/app handles."