Merge "Update InputListener usages in InputManagerService"