Merge "Fix crash in InputManagerService"